bitkeeper revision 1.1389.5.32 (427dd050vCHxq0uiJZz1uFqkyfzA0w)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 8 May 2005 08:39:44 +0000 (08:39 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 8 May 2005 08:39:44 +0000 (08:39 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
BitKeeper/etc/logging_ok

index 17f57acbf9ef6349d999c1fee3eea1c4b725d1c9,e119b60bfa138fd5a55b6c1b9bf9dfef083b7129..379ce87a7276ecd8ce79defefb18bc1ec5dad8cb
@@@ -55,13 -40,9 +55,14 @@@ kaf24@scramble.cl.cam.ac.u
  kaf24@striker.cl.cam.ac.uk
  kaf24@viper.(none)
  katzj@redhat.com
 +kmacy@netapp.com
 +kmacy@shemp.lab.netapp.com
 +kraxel@bytesex.org
  laudney@eclipse.(none)
 +leendert@watson.ibm.com
+ lists-xen@pimb.org
  lynx@idefix.cl.cam.ac.uk
 +maf46@burn.cl.cam.ac.uk
  mafetter@fleming.research
  mark@maw48.kings.cam.ac.uk
  maw48@labyrinth.cl.cam.ac.uk